Use etcd image version suffixes in kubeadm #82348
Conversation
|
@jpbetz: You must be a member of the kubernetes/milestone-maintainers GitHub team to set the milestone. If you believe you should be able to issue the /milestone command, please contact your and have them propose you as an additional delegate for this responsibility. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
k8s-ci-robot
added
release-note-none
| @@ -262,6 +262,10 @@ const ( | |||
| // DefaultEtcdVersion indicates the default etcd version that kubeadm uses | |||
| DefaultEtcdVersion = "3.3.10" | |||
|
|
|||
| // DefaultEtcdImageVersion indicates the etcd image version that kubeadm uses. | |||
| // For example, the image version of "k8s.gcr.io/etcd:3.3.15-0" is "0". | |||
| DefaultEtcdImageVersion = "0" | |||
There was a problem hiding this comment.
should we call this DefaultEtcdRevision?
EDIT: actually i don't think we need this?
we can just have 16 and 17 in the bellow map to equal 3.3.15-0 and same for DefaultEtcdVersion
version really means "tag" here.
/cc @rosti
There was a problem hiding this comment.
You're right. We don't need this. We can just use "3.3.15-0" as the tag directly.
| @@ -425,7 +429,7 @@ var ( | |||
| 14: "3.3.10", | |||
| 15: "3.3.10", | |||
| 16: "3.3.10", | |||
| 17: "3.3.10", | |||
| 17: "3.3.15-0", | |||
There was a problem hiding this comment.
we could have done that for both 16 and 17 in @dims PR.
but let's wait for it to merge and we can amend here.
There was a problem hiding this comment.
Right, I noticed the same thing while writing this PR up. I'll simplify this PR and we can use it to amend.
There was a problem hiding this comment.
Ok, I'll hold it on until #82199 lands in.
/hold
| @@ -262,6 +262,10 @@ const ( | |||
| // DefaultEtcdVersion indicates the default etcd version that kubeadm uses | |||
| DefaultEtcdVersion = "3.3.10" | |||
There was a problem hiding this comment.
we forgot to change this to 3.3.15 (or 3.3.15-0) in the other PR.
|
/retest |
|
/test pull-kubernetes-node-e2e |
|
/retest |
|
/test pull-kubernetes-node-e2e Job appears to be flaking for multiple PRs |
|
/retest |
k8s-ci-robot
added
the
do-not-merge/hold
|
/retest |
jpbetz
force-pushed
the
kubeadm-etcd-image-tag
branch
from
ea4a096
to
4c2b073
Compare
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
rebased on #82199 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jpbetz, neolit123 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/milestone v1.16 |
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
etcd images published in gcr.io now include an image version suffix. For example the image version of
k8s.gcr.io/etcd:3.3.15-0is0.All in-tree kubernetes code uses these image versions except kubeadm and we'd like to update kubeadm to use them as well so that if we ever need to update an etcd image with a new base image or a fix to the scripts contained in the image we can do it via immutable docker tags.
One kubeadm is updated we will stop publishing the unversioned tags, e.g.
k8s.gcr.io/etcd:3.3.15.Special notes for your reviewer:
Does this PR introduce a user-facing change?:
/milestone 1.17
/area etcd
/sig api-machinery
/priority important-longterm
/cc @dims